* fileio.c, fns.c (merge): Move extern decl from here ...
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 1 Aug 2013 22:24:02 +0000 (23:24 +0100)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 1 Aug 2013 22:24:02 +0000 (23:24 +0100)
commit09eab6c68a1d2643bcbeefffa38f8ab8288cbd29
treea61f391beddb06b27d0e8e558cb5f6ba8e16384e
parent0c367bbb6e3f56ccbbc15aef738510e383beb5c2
* fileio.c, fns.c (merge): Move extern decl from here ...

* lisp.h (merge): ... to here.
src/ChangeLog
src/fileio.c
src/fns.c
src/lisp.h